Page move undo feature

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index b646c48..0b10bd2 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -765,6 +765,7 @@ Please check the URL you used to access this page.\n",
 Legend: (cur) = difference with current version,
 (last) = difference with preceding version, M = minor edit.',
 'history_copyright'    => '-',
+'deletedrev' => '[deleted]',
 
 # Diffs
 #
@@ -874,7 +875,7 @@ See [[Project:User preferences help]] for help deciphering the options.",
 'textboxsize'  => 'Editing',
 'rows'                 => 'Rows',
 'columns'              => 'Columns',
-'searchresultshead' => 'Search result settings',
+'searchresultshead' => 'Search results',
 'resultsperpage' => 'Hits to show per page',
 'contextlines' => 'Lines to show per hit',
 'contextchars' => 'Characters of context per line',
@@ -1010,7 +1011,7 @@ agrees to license it under the terms of the $1.",
 'illegalfilename'      => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.',
 'badfilename'  => "Image name has been changed to \"$1\".",
 'badfiletype'  => "\".$1\" is not a recommended image file format.",
-'largefile'            => 'It is recommended that images not exceed 100k in size.',
+'largefile'            => 'It is recommended that images not exceed $1 bytes in size, this file is $2 bytes',
 'emptyfile'            => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.',
 'fileexists'           => 'A file with this name exists already, please check $1 if you are not sure if you want to change it.',
 'successfulupload' => 'Successful upload',
@@ -1162,15 +1163,30 @@ You can narrow down the view by selecting a log type, the user name, or the affe
 # Special:Allpages
 'nextpage'          => 'Next page ($1)',
 'articlenamespace'  => '(articles)',
-'allpagesformtext1' => 'Display pages starting at: $1',
-'allpagesformtext2' => 'Choose namespace: $1 $2',
-'allarticles'       => 'All articles',
-'allpagesprev'      => 'Previous',
-'allpagesnext'      => 'Next',
-'allpagesnamespace' => 'All pages ($1 namespace)',
-'allpagessubmit'    => 'Go',
-
-# Email this user
+'allpagesformtext' => '
+<table border="0">
+       <tr>
+               <td align="right">Display pages starting at:</td>
+               <td align="left">$1</td>
+       </tr>
+       <tr>
+               <td align="right">Namespace:</td>
+               <td align="left">$2 $3</td>
+       </tr>
+       <tr>
+               <td align="right">$4</td>
+               <td align="left">Invert</td>
+       </tr>
+</table>',
+'allarticles'          => 'All articles',
+'allnonarticles'       => 'All non-articles',
+'allinnamespace'       => 'All pages ($1 namespace)',
+'allnotinnamespace'    => 'All pages (not in $1 namespace)',
+'allpagesprev'         => 'Previous',
+'allpagesnext'         => 'Next',
+'allpagessubmit'       => 'Go',
+
+# E this user
 #
 'mailnologin'  => 'No send address',
 'mailnologintext' => "You must be <a href=\"{{localurl:Special:Userlogin\">logged in</a>
@@ -1353,6 +1369,13 @@ See [[Special:Log/delete]] for a record of recent deletions and restorations.",
 'contributions' => 'User contributions',
 'mycontris'     => 'My contributions',
 'contribsub'    => "For $1",
+'contributionsformtext' => '
+<table border="0">
+        <tr>
+                <td align="right">Namespace:</td>
+                <td align="left">$1 $2</td>
+        </tr>
+</table>',
 'nocontribs'    => 'No changes were found matching these criteria.',
 'ucnote'        => "Below are this user's last <b>$1</b> changes in the last <b>$2</b> days.",
 'uclinks'       => "View the last $1 changes; view the last $2 days.",
@@ -1563,6 +1586,8 @@ title. Please merge them manually.',
 '1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect',
 'movelogpage' => 'Move log',
 'movelogpagetext' => 'Below is a list of page moved.',
+'movereason'   => 'Reason',
+'revertmove'   => 'revert',
 
 # Export
 
@@ -1957,7 +1982,7 @@ class Language {
                global $wgUser, $wgLocalTZoffset;
 
                if (!$tz) {
-               $tz = $wgUser->getOption( 'timecorrection' );
+                       $tz = $wgUser->getOption( 'timecorrection' );
                }
 
                if ( $tz === '' ) {
@@ -2025,7 +2050,7 @@ class Language {
                }
                return $this->formatNum( $t );
        }
-
+       
        function timeanddate( $ts, $adj = false, $format = MW_DATE_USER_FORMAT, $timecorrection = false, $dateandtime = false) {
                global $wgUser;
                $ts=wfTimestamp(TS_MW,$ts);